added a lot to window.

still a little wacky on OSX, trying to figure out whats up.