Some fixes and second row is ok.