bug fixes + more msrs