Few fixes
few reverts