General improvements addressing feedback