More improvements on docs