fix typo
adapt to latest dui changes + cleanups