Add UniformGrid as broadphase option, also lots of changes for AVGNA