Download optimizations

Fixes #20