Various fixes - Large text bodies still need work -