changed many location names to be more accurate
fixed some spacing