tidied up source code; added searching by number or name