combat is TEH FIXED!