fixed session issues on for eds and minor changes