cwm: some updates