map fixes and putting the box in just in case