Added OneLinePrinter and minor fixes/typos