fixing some feedbacks from gaurav.
making advanced feature configurable from outside.