Implemented the changes we discussed after the lecture on Unit 1

See the commit log for information on what has been changed. You can cherry pick commits if you like.