Modified pet system to support multiple pets
Code improvements