fixed linking and cosmetic issues