Fix octal
Re-order prompts