Fixed search, updated Makefile