misc changes

new work on client