Commented menu.  Also removed redundant code and fixed bugs. #19