Changed Comments, added controller instance to window class