fix last remarks