Added e3-server and fixed up comments