PedMap, major refactorings 

 	PedMap, major refactorings