other changes
merging server and stuff