minor changes and a bugfix in clienta (but it's still instable)