bugfix, refactoring, boss healing