Added fullscreen mode #2 and some fixes