More touch ups to converter. Need to add optimizations now.