sdl_cleanup++
hopefully ready for merge!
Merge branch 'sdl' into sdl_sp