Initial fixes to services post review
reintegrating wordy changes commit