more linking; closes six issues