various improvements + addditions, solidly builds/tests/intgrates into umbrella.