Local IO - Get files from dir updates

Tried to fix first two points of #77. Last point depends on #76.