some changes to various things, mostly categories