More work on the combatsystem.