Finished intersection search, various minor fixes