In Progress

api fix and small changes to grabber