major fixes on items addressed by M