Yes, combat needs more feedback, you are right.
And Jill will get an update as well, after all I am the one who had to endure her the most :).