many changes to get this download thing working