More doc + small reworks