tweaks; prepare for FTP support