Cleanup, and update read me.