committed all recent changes to develop branch

(by copying content from my patch1 version)
Includes updates through most of priority 3 variables