more pets fixes

We're almost there! About ready for Zak to do a design sweep, then we'll launch