Optimization started
More work
some changes
Some code changes, code reorganisation
Dev->Master merge