any minor changes - most were on server