MyPet feature fixed

I've fixed the MyPet features and made some small code improvements.