Clean up; Fixed some broken commands.
Merge pull request #7 from Elixur/patch-1

Clean up; Fixed some broken commands.