Cleanup
Update dependency to >= 3.2.0, < 4
Little fixes
Update version