More tweaks to cases
All done with basic use cases