bugfixes & speedups - next, crawling