Adding a couple new commands and patching a few bugs.