Gremlin api fixes

This are my last commit for today. 

Now the Gremlin APi is at 100%