implemented diskio.fileservice + minor fixes
Merge branch 'master' into no_batch