Few fixes with the options. Needs further testing and probably to add more code