some fixes in goods model