migrate to aws-sdk and other improvements, still broken