cleanup
fix pet/tot problem