Added all of the new options that we went over and fixed linting errors.