put file senders in one thread due to weird issues & a few fixes
merge