added some new features including a prototype assembler and some markup scrubbers