a few clean ups. added aws