Updating base set, fixing pathing and location