Fixed a few things, and am working on search.