Improvements...

See commit messages for a description of updates