Reworked options to prompt, changed list handling