added configuration
fixed some configuration issue
fixed some configuration issue