fixed some links and merged