Rewrote potion code

also some other stuff