bugfixes and further enhancement of infinite scrolling feature.