(mostly) fixed the sorcerer to account for box wrapping