merging some doc changes from master