Bug fixes and added pet types to tooltips