Fix Queue bugs
Optimise Saving