Mainly changes to ServerMain