more cleanup and basic search

did more cleanup, added basic search class