Smarter fullscreen and a few fixes