some ws cleanup and added ENV check for warnings if stem resolve to multiple files