Fixing more bugs and updating README