WIP Fixes and dl