Fixes a couple Bugs. Refactoring

CLI: I moved the parser code out of main(). Hopefully it's close to being testable.
CLI: Makes 'Help' command a legit command.