waiterdecorator fixed and interrupter added

subj