Alot of fixes for the search engine + minor fixes for methods