multiple changes to code, initial pet bar support