Trying to fix some ghost problem
some changes and fixes
merge conflicts