various new features

Change-Id: I0882362eba8a03419263ae58f23dac45a15ce653