Fix some bugs and update

Signed-off-by: tianyuli <tli@wpi.edu>