WIP bug113
Fix cut'n'paste bug.
add support for bridges and clients running with bridges