Updated searching, minor changes to other