Some fullscreen and logic fixes