models cleaned up and added default categories