More case improvements......