fix loading
add data saving