Add quoted strings
Fix hex prefix bug