Resolving Mistakes and adding some more info on how to get the Source