Added background adaptation to pass 3
Minor other changes