Fixed some issues with combat ending incorrectly, fixed position of damage and healing numbers to be visible

fixes #179