Summit 0.10 compatibility
Shrunk window and cleanups