fixed untracked files
add full amazon support