fix logout issues
assets
merge from fix_user -- lots of stuff seems missing from master