fixes to the ui and server.