adding some more til
Merge remote-tracking branch 'origin/master'
more background changes, unfinished