save feature

bug fixes for save feature