bug fix, add math, refine style