(General) Content edits and reorganization
Update references
(Track) small edits