make new sessions work and a bunch of otehr stuff
merge in a lot of changes wooh