better search and more model adjustments