* Made client slightly more usable for less painful testing.