removed assemble-internal, minor edits