1) fixed a bug in additionalBootstrapping(). 2) Separated method doItMarkup() to 3 helpers, add test cases of them, and tested them.