id and formatting fixes