addresses bugs 888, 885, 884, 882
Merge branch '885_mo_bugs' into develop