Mode3

the fixes we talked about in the forum.