Fixed stuff, going to add SDL soon