Fixed Logging, Updated Combat Model