fixed a lot of stuff in the infinite scrolling mixin and did some code cleanup too