moar links added, moved around