further progress on adding in fig. Now builds most images