Small fixes also added Email to register