SW-98. Various minor improvements for setup, including README.txt
SW-98. Code formatting improvements