updates to FTPS
merged