Added some useful defaults
Minor changes, calc, column-indicator etc.