Add new servers, fix some broken behavior, cleanups