added comments and custom menu items