boiler bugfix & refactoring