Syntax and name fixes
Comment fixes