bug fixes & started adding search capabilities