Used new BLOCK_FACE constants

Also added more comments