Some changes. Client now looks like he should.