Fix spelling and add notes on hosts file
Manual merge