Various changes throughout several files