cleaned up client stuff
merge master