Revert "Revert "Fixes for Lecture 14""

This reverts commit aecd343a99f92b1c41584298d56f4e42f1194db5.