fixes
keep track of options