Updated several files