Covered more valid subdir cases.  Cleaned up log printing.