New spawn locations, should fix most of the item stacking