Search fixed, more translations added, and small cleanup of code