Add cat
Fix Paul's name
More wordsmithing
Split up configuration
More tweaks to configuration