Combat music; some minor combat fixes