Misc edits, multi-argument calc function, new columns function.