Stage 6

updating links and fixing lists