More fully implemented dialog helper and vacuum