updated fig support
cleanup