Changed some things in block definitions and improved performance.