reorganized/fixed some links