fixing notes and more use cases