Improved markup syntax. Fixed bugs. Updated and completed breadth of test coverage.