More login server stuff, general cleanup