changed some stuff for SDL2 + formatting