more calculation corrections