done some TODOs
Merge branch 'master' of https://github.com/lukaselmer/VFSPrototype