fix bugs, should test with post mission data at next