Updated more comments