fixing some session bugs
tweaks to cookie settings
merge