Some corrections, also to get proper quotation style