Revert "few fixes"

This reverts commit 4c11a990e3eb40d393e33287665a51c8020ca4d5.
will add back at a later time