Further documentation tuning