rest of the comments fixed