updated server stuff
merge of server