Updated searching and various improvements