fix intersects and get a whole lot more test coverage