Combat log reworking, other minor small improvements