Keep simulator compiling
Comment cleanup and other cleanup on Timeout object
Comment cleanup; build system changes
Alignment of new menu items