Gremlin related changes

Bugfixes and changes in naming mainly, but also improving timeout duration handling.

The last commit may be controversial, so if it's not wanted drop it off the merge.