More cycle nodes and fixing some "finger painting"

https://map.bnnd.eu.org/user/cartinus/diary/5305