Some more checkstyle and fixed combat bug. (I think....)