Fixed trying to stack together incompatible potions (again).
Changed some output formats.