some figure fixes