Added closeness friction
about to merge
Fixed stuff
Merge