updated with registration and verification flow, minor fixes