added more use cases and fixed some of the old ones