Improvements on documentation