Variables and prompts added. Other fixes too.