Expanse: update april 4

Fixed some bugs, improved the search algorithm