assumptions, pr1

Mostly some stuff from pr #2210