Added kitten placeholders and a few other minor things