added math, thousands support