mk-Session: Some corrections...  this code is still not very clear.