form formatting and a calculation correction