some fixes
fixed back button
Merge branch 'master' of github.com:kkholst/SuperMan