Cleanup, Fix, and add basic search