fixed session issues and conflicts from yesterday