MapView completed. and some tiny changes to link things better