Minor changes / cleanup.
Window is now the correct size.