Package updates
Better error logging; bailing on first error
Raising retry timeout to 5 minutes rather than 5 seconds