Add ServerData class for save/restore server data
Cleanup, minor fixes