Restore shell format and add verbose tracing for VCS