new save file & choice form minor fix