new default search
general tidying and fixing