Added some extra comments so I can pick up where I left off tomorrow. I also renamed some lists and other small things so the code looks a *bit* cleaner.