fix on session
added fixes on scripts
merge