Multisession part 2

Adds suggestions from @nicktuku