add some context action
cleanup and more actions