More Potion Changes

Added the chalice, misc other potion changes.