fix bugs with enter goods and units