Several cosmetic changes.
Merge branch 'devel'