add some verified changes;
Merge branch 'last_good_pet'