Cleanup some snapshot logic
Improve error output for failed API requests