Updating README, refining internal API