more minor changes to server
Checkpoint: first, draft commit of untested frontend