Get changes from upstream

Add Jenny's notes from reading DataStructures