fixed quotes and comments