cs fixes + prevent from destroying nodes hierarchy by performing wrong insertion/move