HUGE speed improvement for infinite
scroll plus a few bug fixes