addressed some vendor feedback