changing imports to get linux to work again
getting server running reasonably again
client exits cleanly