Fixed the windows.py implementation.
Added a return statement to the handler, so errors don't happen.
Added minor fixes for capitalization.