fixes for previous commit
combat logic bug fixed