fixed a bunch of use_cases