calc bugfix and norm expenses now optional