Working on server improvements.