tweaks from the server
server tweaks
stupid merge