Major changes done (see below)

without benefit of github due to new laptop