more fixes/work on download