integrated the work I did into master, made pet selection work, etc
fixed a glitch that caused the pet screen to be incorrectly initialized