Search function files.., minor fixes I hope