Updated a few more routines, trying to hunt down a few session handling bugs at the moment