update short version 2 sept.
update short version sept. 2

Included some changes which were forgotten the first time round