better option/prompt handling