Window is now correct scalable. Add some minor fixes.