edited minor things