reworked client and osgi slightly