Fix some. Need more