Fixed up the rendering code to support word-for-word and PDF generation, many vocabulary added