Adding final fixes and updating README