[OE-3096] session editing and various bugfixes and improvements.