Doc improvements

@lunaryorn Care to look at these changes?