Small Updates, completely merged files

These are the fully updated/merged files