fixing issues, investigating failures.
merging sat6-fix