Some fixes, now saves data and more!