Added spectool to retrieve upstream sources, refactored to simplify a little.