some bugs fixed, save enabled