Improved language block definitions and some general formatting