Some cleanup on the potion logic, and commenting.