some more fixes in manufacturer (work in progress)