Use constant as array upper bound for easier maintenance
Ctrl-F4/Ctrl-W window close functionality for remaining windows; typo/spelling fixes.