major editing of 2.html
fixed basic edits and forwarding