Updated content for #29, #33, and #34