refactor/options bugs