Updating README, other cleanup