merged new critter stuff with kate's