Stage 6

updating links and fixing lists
Merge pull request #102 from angelopez32/master

Stage 6 / list refinement