Updated assembly info
Updated various pieces