some tweaks to server
merge conflicts