Width fixes.  Closes #33.