fix most remarks