Little fixes and SDL GUI (not complete yet)