Code and email format fixes.