Adjustments: use correct names and un-bold string faces