Code highlight and syntax fixes (some semicolons)