various changes - including aws ENV VARS amongst others