Bug fixes, Session test
Bug and q fixes
Bug fixes