Fixed issue with code being in wrong scope.

Fixed session bug.

Bug fixes.

Beta with tweaks.