Added new base blocks containers.
Changed comment styles.