map stuff, sorry but couldn't commit via branch...
bleh
Merge branch 'master' of https://github.com/Kraegon/GTec