updating links and fixing functions