2. Make the code feature-complete with the code from the paper (done)