Added category commands
Bugfixes to category commands