fix comment names
fix done