Just a couple of small fixes

It's not much, just fucked up a bit with git :P that's why there are so many commits.

Fixes a nullpointer in the menu, again...
Also adds a simple help command, just prints out a very basic description of the available commands.