adding user/password / few tweaks on transfer tool