complete save/excute feature,  add comments