Bug fixes. Revamped the command parsing engine.