bugfixing, use cases revision