More tweeks to collision and follow behavior

Look at the title.