Revert "fixing a couple of thing"

This reverts commit ea52f77394b596ce38b280d0ec8fa1d7fd2a0f4e.