fix 3 bugs
Merge branch 'master' of https://github.com/hashady91/gt