[Sven Osymthe]

I can't remember for sure, but I think you're close to being done for both.

As for attacking, they have adjusted that quite a bit, sometimes the enemies were too aggressive, and other times they just let you stand next to them and not do a thing.