Fixed up client and some server stuff.