Linking + bug fix.