block: updates and optimizations & row from CAF 3.4(mrg66 & other)