Give targets neighbours! + many more improvements