fixed comments and strings