various fixes
category fix
Merge branch 'master' of https://github.com/willde/catalogr