Improved our full screen mode. Also some minor cleaning up.