Refactored some.
Updated README.