Add MinFree Controls

and some minor fixes