fixed distance to modifier bug
remove comments
merge