refactored some things, got rid of completely unnecessary windowing stuff