Updated TODOs
Cleaning up the CLI and added aws example configs