more improvements to PrettyFig