Fix all syntax errors for working combat