Updates to several files