tweaked some figure handling