various updates

production updates. No big changes now, but a little of everywhere
changes to make the assembly more easy and right.