fixed comments and subscribe