Add boss, bug fixes, some refactoring.