Changed neighbours from vectors to maps
merged last two commits