Misc changes

- Making symbolic link step more generic.
- Addressing comments by @rgoj.