more remarks fixed