add few features and tweaks

Change-Id: I737bf18940253c0df85a345a058c5debc4f6992a