fixes and tweaks to cats