fixes
Revert "Further updates"

This reverts commit 9e22b455f0d370854c67cb7f91fc85b9ad8f83be.