Some fixes + save to file/load from file