Better Window Handling & Comments