Cleanup some TODOs. Bump version for publishing.