clean ups, mgf option added