fixed more linking