Added missing hyphens
More corrections from Matts comments