big fixes, delayed write to aws