SW-98. Minor fixes, documentation and formatting.

Bumped version to 1.6.0.