added nfs-mount, refactoring...