docs and internal adjustments