more dependency improvements