Add some additional echo's for easier debugging.