bugfixing and cli help