Aromatherapy + Sap Sipper + Clean up bad code
Merge pull request #1277 from Fuzzysqurl/bugs

Aromatherapy + Sap Sipper + Clean up bad code