Various samll modifications.
Merge branch 'tmpwork'