adding search functionality
making search pretty
making tests compatible
fixing some esthetics