Some enhancemts + new option enable disable plugins added