Load & Save + small bug fix