fixed login/signup/raverify flow, did a little decomposition
resolved merge conflicts