master
Several changes to follow recommendations of code reviewers
apply most of stage1 futurize tools