temp save
fixed bugs