Progress on infinite scroll, plus some additional little fixes