More fixes. Div2 shit should be right this time.