Tweaking, cleanup, and updating readme.