Fixing some state bugs.
Updated readme