Fix NPE
Remove cloudmade
Fix geo
Fix route recalculate