more changes from feedback