Some fixed to comments