various updates
Revert "various updates"

This reverts commit ea660d37914a0a092fe7bec4d98e07f7274fad80.
Revert "Revert "various updates""

This reverts commit 86329176c180ebb8b152c94b61e6af763ee41d7f.