* more sdl changes

* more fixes

* update SDL

* cleanup

* cleanup

* rename var

* redo how in_transition is handled

* add -O2 flag back