cosmetic changes, UI, prompts, etc
merge