some changes, clean up and new symlink