Commented code and updated server addresses