Improve source link representation, misc fixes.