Furhter improvements on documentation