Tweaking things and adding search