Imrpove freevars