fixed some bugs, escape/android back button now works, some things are cleaner