improved CallHandler
misc