fixes for refactoring Sdl methods from main