Fixed saving and other things