add comment finish, problem manage comment, check later..