block: various fixes and ROW enabled