bugfix + cli support