Fixes to measurement code as per intel manual, updated versus frame