various improvements
various improvements



Former-commit-id: 58f6549433399ee3d1cb12fafbb54c451ccc618d
julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine