Fixes to the combat system. Guille updates quest.