correct docstrings
t Merge branch 'cmd' into develop