update with revised versions

updates based on changes made last winter