Updates per reviews, further conversations

Also removed redundant note about username and email checking