Added Window_Handler, fixed connections, and minor bugs