fixed directory handling
commented out self skip