Added more performance changes; also included FTP