fix deleted variables, better feedback messages