Corrected error in make-stmt and added save-to, all and get.