changes to support format statements and more formatting strings