fix zero-to-many links issue and inclues
updates