simplify end conditions drastically
bump version