Updated a few things that I didn't notice the first pass