Dict taken fron onlineconf now by default. Changed dict parser logic to reflect changes made. Fix few logic errors.