Revert "updates and fixes"

This reverts commit f02249ebd46e4da58745fa5ff48a88eb1aa6f498.