Location Adjustment Cont'd

Major improvements in location collection