improvements from feedback