Several Changes and overall formatting