Did a bunch of updating, started work on server

Note that server is still not building for reasons unknown.  It cannot
find the entry point, for whatever reason.  Will investigate later.