Several fixes
Merge branch 'master' of https://github.com/Jorl17/ijava-transformadaz
Loads and motherfucking loads of bugs and features