Fixed comments along with a couple of mov/ori issues