Fight improvments and map fixes