Fixes to width & height dethods.  Still not perfect.