Some preparation for collision avoidance behaviour and some streamlining of grid handling.