fix shell-pop and change org agenda commands