Rename vars, flee behavior fixes etc