fix | reverts some issues from previous commit