Added help command, refactored to support that as appropriate