service charge and total correctly calculated; better switching between cell types