QM: more mistakes..fixed