fixing flex and saver bugs