minor tweaks
Remove server puts