Proofread, improvements added
Merge conflicts fixed