wendyandnee adjustments

updated per master