made some changes to get server functioning