More cycle nodes and fixing some "finger painting"

https://www.openstreetmap.org/user/cartinus/diary/5305