Replaced a few more entries

and added back the last 2 sections