More updates, search almost working.