Done, committing before Joey breaks it
Handled empty commands in the trace file