fix warning
fix errors in loops
extend test some more
merge action