more working server changes and cleanup