context: more command handling