Better intersection, pause screen, some clean up