Fix bugs; optimize coefficients
merge
tang's merge