More Bugs/Fixes/Addition to session library