Added Client Name

As well as other minor changes.