fixed session writing + merge with orign/master