More tutorial work

Basically finished combat tut.