updated searching, added cosmetic fixes