fix #125. session handling still needs work.
playing jaintor a little