Combat Info and minor bugfixes