Support commentaries
Fix bug with 'r1', 'r2' cycle registers