Bug fixes. Revamped the command checking engine as well.