persistent user state
bug fixes