fix small glictches to run smoothly

hope these changes make sense,
Laurent