Some small changes

These are are bunch of mostly cosmetical changes (like error messages and function names), but also 2 fixes.

I'm also working on some new commands; prepare for more pull requests incoming.