fixes from taylor
Merge branch 'master' into HEAD
turn off some debugging
Merge branch 'm2'