Fixed apostrophe encoding
Fixed `,` formatting...