More split logic. Better download filenames (not unversal though)