Added follow symlink option + other minor fixes