added more cats!
Minor partial fixes