Revisions for days 2, 3, 4

Note: I believe I have merged my fork to the latest upstream version. If there are problems, please let me know.