More tweaks to 04-calc