External files updated & fixes