Updated the list of options and some code structure fixes