Review of files done, decisions made. Improved macro-syntax and language-sample.