Updated some other files that I missed the first time around