Fixed some validation bugs w/prompts etc