Fix many category bugs
Merge branch 'ssupgrade' of github.com:ging/vish into ssupgrade