update server/lib to match. Gotta find a way to share these.