Documentation review (final!)

Plus some small code improvements