Many minor fixes to make CS2114 textbook compile cleanly