small tweaks.  Still not quite dealing with the cases correctly. Blargh.