some clientside improvements