Updated prompts and if logic
fixed typo and minor format tweaks