Bug Fixes + Prep for more pet features

Starting work on more pet features, fixed numerous bugs (Some properly
fixed, some theoretically.)