Minor Updates in control module