Cleanup
Renames some methods to make more sense (see changelog)
Bump version
Fix syntax error