[WM WR] updates and edits from our core tech checkin