adding session specs as well as some other fixes