Working on basic search. A few other small changes.