wording
fix doc blocks
fix cs