actually fix
renames
cleaning up
updated README with new API
fix tests