fixed comments and syntax