Fixes
Fix typo
Bump version
Refactor and bump version