Update and fixes
Gremlin