Fix small resume bug; work on fixing downloads
Fix resume downloading bug
Merge branch 'resume'