a lot of bugfixes
Merge branch 'master' of github.com:coorasse/Airesis
fixes