Rx logout

also fixed a couple of bugs