Fixed parameter names and a bunch of unwrapping bugs in Session... also
one infinite-recursion one