Update fullscreen, and various code cleanup