integrating gap fixes from Newberry interns