fix remark w.r.t. regex for 'module X'
fix remarks