comments and quotes fix