Block class complete, minor fix OM and SM