Cleanup and make work properly.
Bump version.