fix multiple saves
fix callback issue with async.waterfall()
fix display issues