Refactored marshal printers, TextGenerator fixes