Combat now works against Traders and Pirates. Can also leave after finished.