Did all the changes I asked for

Review by anonymous client

Invite to work