fixes to motif2