Improvements, assembly updates