Add doc plus minor tweaks