Fixed remaining combat bugs and added/updated features