small fixes, + save/load to json