small fixes
Saving and ArrayList