add comments
add debug menu item
move to DebugCommands