Made some changes per Matteo's comments

There are a couple more coming tonight.