some cleanups, very basic search