Additional init script info
Controller deadlock fix and huge refactoring