joinSession, tidied a few things