More Changes Again

Same as last time for more files.