few last tweaks... not finished though. Email registration still not fixed.