Implement search

Also going to fix some typos and minor changes