FRANCO: I was testing the new version of the code on Doras' computer. I fixed a few minor bugs.