Fixed most parts