texts
some response stuff
fixed conflicts