Cleanup, add feature, add to readme.