3rd

minor changes to combat; auto fight now works