removing embedded control-M plus other minor fix