added aws, fixed some deploy errors