FIXUP - plot improvements