Revert "Revert "minor updates""

This reverts commit 3c194c5614539c956e8550c7bfa0073b930f8c41.