more tests and fixes, still work-in-progress
TRIVIAL cleanups, work-in-progress
webserver work-in-progress