updates

options from enumerations (wip)