More wrapping; some reflection for potions