Last commit before final presentation.
Note the date on this. I totally forgot about these changes until now.