Minor changes
ID for clients added & some names changed