Minor changes.
Modified Serverstate classes