add some basic aws commands; refactor a bit