Changed coefficient expansion and misc others