fix stor & first step to fix list (need to check directory vs file)