fixes issue #21 (smashed failing); tidying up in graphic