minor tweaks and fixes for server release