Some modifications. Fixed up map locaiton.