Fix unicode $ with escaping and some format inconsistencies