general funcs updated. search pretty much done.