Assembly and other updates