Case tweaking

Etc