Fixed formatting, added additional input prompts