renaming some identifiers
add symbolic link handling