Corrected minor bugs in awk/bash dirlist.
Fixed merge conflict.