Several Syntax updates fixing encoding (Block 4)

Part of #110