Correct targeted-server responses+ put comments on methods