rearrange some stuff
em client fixes