Small adjustments and corrections to both versions.