Added FreeDialog.  Other cleanup.