fix 7 edge cases, bump version