Fixed hiding, shelter, and following. Magen changes