doc change and minor cleanup