Added steps graph, tidied source prep code