Added comments and fixed up menu

Added comments and fixed up menu