Changes to macro-syntax, removed '$' requirement for blueprint sub-blocks. Changed Calculator.ks to reflect. Macrosyntax improved.