Added Searching and patched up infinite scrolling a bit