fixed alert functions and search and other things
fixed merge conflict
Merge pull request #63 from kexline4710/search_fix

Search fix and errors, and other random things