fixed fixed fixed and behaviours are correct, only cyclic ones are actually cyclic
merged with my branch and working! sick