More fixes

still does not work properly, although part of the connection is hand over correclty