Add defsubst characterizing agenda commands
Improve docstring
Typo
Drop org dependence that reinstall it
Add some defsubst to enhance readability