add S3 stuff and change #long with #lon because of.... amilcar