proof-read and some minor adjustments