Fix context interpretation of command arguments
Improved trace command