Jb mr1

a few minor changes...