Fixed more comments