Everything from FTP

Also fixed indentation.