Aws and bugfixes

Reintroduced use_aws setting and fixed a few bugs
PR also includes some documentation improvements